update for few fixes