bug fixes and set up for spring2014 study