Grunt inited
Numerous bugfixes