solve the small issues