Work on updating docs to reflect reparameterization
Bug fixes