Cosmetic changes to upoopia. Other minor fixes.