json files and grunt fixes