Updates and slight fix to VLC timing