cleanup
clarifications
whitespace
Merge branch 'joka-2013-11-21-new_api_and_refactor_python_backend'