minor tweaks. commit before merge with joes new stuff
fixed merge conflicts