more tests
TODOs
small compatibility fixes