Found a few more errors in main.

While checking to see  if I could mix all if statements in
long_short_values.