Rewrote the getters and setters, added additional items, updated docs.