A whole lot of fixes

Fixed Cardinality and going onto more testing