Fixed video size, started on cleanup code