minor changes, trying to get input to work