Cleanups, fixed UE ratios