stuff and changes
fixes underscore naming
mergez