Rearranged some of the methods and improved docstrings.