Commented out some debug messages
Updated build