Fix python 2.6 support
Add TODOs