More changes as I fix grunt tasks
Merge with the latest updates