minor changes to get master up to date