General un-breaking of several things. More un-breaking tomorrow.