fixed some input issues