tweaks and debug removal