add grunt and remove bugs