Several updates and minor edits
Updates