reordered methods and tests
tweaked docs