Adjustments to upoopia. Various minor fixes elsewhere.