updated cleanup + docs