Added --force option and fixed broken --novideo option