Updated Ufo and UfoSpec