Added Grunt, loading window. misc changes.