Small fixes and rewording