minor updates — still a lot to do