Diverse ausbauten

Work in progress