Remove debug, minor update