Lots of baseline updates, and code cleanup.