fixing little by little everything that's out of place