Add Root back, plus some test and doc fixes