UL enhancements

Integrating all the monkey patches I've been doing.