database improvements #2