bug fix and grunt tasks