Updates to database script - now with real ideas. NB: Drop the current database and re-run the import script.