Improvements to grunt previewing and small fixes.