grunt fixing and few stuff
grunt fixing and few stuff