added inputhandler, changed inputs