Updated database name.
Miscellaneous changes.