Added video and some bug fixes