Mostly fixed input issues.