Make changes I talked about with Nick
Fix broken links