fix the last issues
clean up debug output