Added makers, less/grunt tweaks