Small tweaks, comments and grunt fix