Changed stuff
Hotfix for the tards
Another commit
Added some text
Merged into master