fixed all rrors