added new metapackages, better formattinhg