Some tidying up, and we should be ready for a test install to PostgreSQL