merge fix Kort and Korttest nothing changed, some of davids code used (see copy)