Video mostly working and other bug fixes