updated gulpfile and some tweaks