Updated Gibbs tracking and documentation