lots of fixes
remove comment