correction to setup and small changes from friday