few code updates