minor fixes, less debug output