fixes to problems when used in real data entry scenarios.