better doc, cleaning up