more todos, fml
Merge branch 'master' into FIX-123-video-bugfix