done all small thing need to fix