a few more __all__'s and some fixes; does not build locally though