some edits!