minor tweaks in Database class