cleaning up and extending docs