saving work -- a couple fixes and a hack