Some stuff I changed a bit

- take a look around
- if you want to commit changes do so as well
- :-)