collectedOn --> collected_on (for consistency); adding user name validator; noting some unit values I've seen in recent CBCs.