- added vids
- bug fix and cleanup