Update for input

And some other fixes