Updates and code cleaning

Hey Karl,

Some minor updates to the code. I should not change anything besides making code more beautiful and removed some of the old commented code out of the way 
(See http://blog.8thcolor.com/2013/04/dead-code-is-rotting-your-codebase/) 

I'm currently investigating the crash of Piotr Bednarek, so if I find anything wrong there might be more updates..

Gr,