updates from Josh/Mark feedback, added video functionality