Yet more bugs fixed, and more introduced