solving small issues