Benjamin's data model, prune old notes
change more links to https