cleaning and fixes