pull final code changes from pennapps 2012s