cleaning cache and other fixes