Some changes based on feedback on GitHub.