switched to typdefed types for short and int instead of the base types uint16_t, and int32_t