grunt integration and small tweaks