Suggestions for your universalDatabase pull request 195

I got carried away with suggestions, and ended up changing so much that my code review needs reviewing itself! *sigh*