Fixed errors, added grunt tasks