few small issues done