fixes to compile on updated library
formalized 7.12, complete notes for 7.1, partial notes for 7.2