Plenty of reverts and bug fixes.