added ef, moved stuff about, removed references