please merge, has various small bug fixes.
also removed outdated variants.