cal improved, minor documentation naming issues