fix grunt build
clean up
mash choice tweak