removed video option, refactoring
more refactoring of the old code, fixes