Nominally complete upoopia.py. Other related changes.