Fixed Grunt. FINALLY.

And did some small changes to other stuff