Database updates

Issue#160
Database updates

Issue#161
Tweaks for Brian's work