updated half the doctrings and tested