Cleaned up the non-new database entries to match the existing one when appropriate. Added support for a previously-unseen royal format.