More Input Improvements