fixed variable input names. will fix globally-declared variables later.