dist: Fixing grunt build, dist files and some small bugs.
Working on correctness