small code fixes allowing tests to compile
fixed merge conflicts
fixed partition throwing away end values