Changing all this back to using an int.

Who cares about int versus short, I'm not a professional.