Removed debug code, further fixed comments