Improvements to capturing input