db.c refinements .... still a lot to do.