Updates and edits from Justin and Steve