Overall minor updates