Add a few specs, updates from before presentation