Lots of refinements, upgrades, and bug discoveries