Input improvements - Part 2

Hey Andrew,

Here's some of the changes we discussed. I tried to push them to your PR but don't seem to have permission, owell! Just merge this after yours, perhaps?