cleanup, bugfixes
remove leftover debug statement