Some shabby input improvements.