changes that were missing from the wed->master merge
master branch should be good now