pull final code changes from pennapps 2012s - again

Looks like not everything was pulled last time