Brought the code up to date

Brought the code up to the version used for the usability study.