more tests
bug fixes + some octane debugging