minor changes
removed some debug messages