Large update--new master tables, cleaner ed series calculations