Quick Changes

No major functionality. Just some added comments and removed debug code.