Gg suggestions and fixes

Just few proposals from my workflow and 1 typo fix =)