latest changes to fix of gruntfile - not there yet