Updated calculations to reflect 2015 code and renamed optional lectures