[Upg] Better documentation and minor fixes