some comment cleanup, removed old commented out code

There is a lot of old commented code in the source, I removed some. Also adjusted some comments where missleading.