fixed merge leftovers
cleanup
video image via world
buffering input
cleanup