minor enhancements to SinglularField implementation