Lots of updates, include pdf