Add a couple of TODOs
Update some broken references.
Update usage doc for assert-* macros and general revamping.