Lots of fixes. Reviewed. Passes ERC, DRC, rats. Ship it.