cleaning up, adding docs