bug fixes, exceptions for video