further small changes, not finished
Merge branch 'master' of https://github.com/seitza/tdcv13