Fixed insufficient indexes in getting from a 2D dataset
Fixed odd/even tests
Fixed NPE and resource closing issues
Fixed equality override and added minor refactor