Added __init__ file, numerous fixes.