merge in various old branches with useful stuff (not code)