Fix assorted text, mentioned in #214

Fixes #214

@tiborsimko: Good to go from my side.