grunt and other optimizations

Signed-off-by: Rob Erskine <Rob@RobErskine.com>