Improved the grunt workflow, the dependency issues and some other tiny details