fixed all Issues