fixed few small issues