main/final updates and edits