more updates from ugo and more tweaks from me