More input improvements