fix many editorial issues from Ian's feedback