fixes and variant management tested