Alpha 5.2

Removed debug statements, cleaned up code.