few fixed and impromvents