requests and suggestions per Michael in PR #303