some basic edits and updates