updated changes that didn't make it into mastor