Cleaning up for meeting

Just some cleaning for today, mostly comments and so on
Merge pull request #39 from MarcelBock/MarcelMaster

Cleaning up for meeting