Updates & fixes
new grunt build