Fix a few comments. Deleted debug code