Removed debug. Fixed a few other things.