tweak fixes
add videos
Merge branch 'develop'