Cleaned up some of the effects that rely on it being the nth card played