cleanupo; improvements