Fixing more text input stuff

Still not complete