Removed unused stuff
More comments and small changes
Merge pull request #1 from MarvinMenzerath/master

Small changes and fixes and stuff