some new properties and cleaning