grunt and style fixes