Answered some of Stef's questions, some minor edits