Mostly fix the input on it's own thread

Signed-off-by: Jack Huey kitskub@gmail.com