incorporated andre's part & added video comments

still need to fix incorparation of two parts