Documentation cleanup+annotation and some test cleanup