short int refs fixed - runs now.
More cleanup needed on code to remove warnings.