moved variable returns from input functions

this seems to have fixed something