Made prints and docstrings consistent with api branch