Lots of fixes in this one.