Hopefully final round of doc/clean/tests before merging.