Language fixes after notes from @starcraftman