final changes and grunt build