some fixes
underscore in names bugfix