Some (small) fixes, and 97% coverage