changed wording around for some functions and restructured some of the objects