Bugfixes

Removed some comments and revised the for statements.