Feedback from pull request
Merge branch 'better-inputs' into preset-all
Nitting nits