Adds suggestions, and makes a few other nice changes.