more cleanup. shorts changed to int16