some clean and fixes