fixed grunt and a little cleanup