removed debug
tweaks and debug cleanup