finished some edits