crushed a few bugs
all tests pass and all branches merged