Lots of updates to __init__.py and other things.