cleaning and few fixes