fixed bugs so all tests pass