fixed the small issues