Some of the nulls are now fixed. xd