bug fixes and added variable duration
Merge branch 'master' of https://github.com/jeanniet13/EECS394