Final final bugs on this branch.  Really!