bunch of tiny changes to goals