update with lot of small issue fixing