Fixed a few bugs, and attempted once more to fix grunt build.