fixing documentation, making naming more intuitive, adding more to tests