More minor tweaks and a script to reload the db.