fixes and remove dirty things