Changed some things here and there, but mostly just changed input functions.