found more bugs, I really need a test suite