Fix more errors, add Grunt support