More bugfixes
Wow
Some test cases