This commit: some changes after diffing 'steve' and 'master' branches, and integrating these manually into 'jer' branch.