Removed debug, little code changes