many things was fixed