some grunt; tweaks