more tests (py26 supported), optimizations, etc..