some edits and updates