various updates
video added
merging remote