Changed up some input stuff a little