tweaks and debug help