some edits and data updates