Minor cleanup on the (incomplete) UTM handling
Implement UDOFL / UDID parsing