fixed all isues