Checked off milestones, cleand up some typos