Various tweaks, including ability to see the database name.