Suggestions branch

Suggestions on a clean branch.