Some stuff fixed!
Removed some content
Merged a bugfix branch with master