updated docs and cleanup