updated lots of things and added grunt