made more of Vic's recommended edits