some more small fixes, removed debug messages