Uleat cleanup 1

This is big enough to warrant collaboration, but anyone can go ahead and merge it if I'm not around.