Fixed gruntfile and small bugs, updated comments