Input fixes and improvments