refactored + bugfixes.
grunt build refresh, to last commit.