Fixed a few minor bugs.

Changed __init__.__all__ to work with current setup.