Improve citation database and output