updates to account for G.'s latest improvements to ahkab