fixed all but one compile error