More updates to UFO dev code