More updates & edits.