Updated schedule; updated grading