adding cleanchace and many other changes