Cleaning Here and there and fixing some stuff