Massive amounts of cleanup and optimization, most notably with Abilities