gulp and other improvements