various fixes to .u