db function name changes;  comments improvements.