fixed few problems