fixing the small problems