minor changes to Input code