More fixes and rigor