Various fixes, video added, empty messages added