cleanup and grunt fixes