changes to setup, and changes elsewear