A bit of tweaking done

So I fixed a couple of things. Here is the more finished version (not a lot of changes, just some tweaking).