Optimization talk and some category fixes
Merge pull request #16 from philipithomas/stage

Optimization talk