Performance enhancements. Changed the name lookup in the database to store everything already added in memory, rather than one and one lookup.