Cleanup, Added Debug mode.