Work on HasOneField
Improve reliability and configurability of HasOneField
Work more on HasOneField

improvements

more improvements