cleaned up mutators
minor fixes
replaced underscore with lodash