fp now uses int64_t, appropriate vars standardized