General wp

Lots of goodies here.  See commits for details, but very little left unturned here.