minor update, narrow var types to short/long