2c03 changes mainly

everything else was more minor things in-class