formatting fix
small fixes; added all base classes