Updates
Fix variables, fix grunt serve, fix jshint