Bugfixes. Removed some debug printlns