grunt build system, several fixes