Added password recovery; made some other minor edits