misc changes to code in prep for ms work