updates and cleaning