remove some debugging and edit tune