updated __all__ to include several other names