upgrade now works, still conf todo