Remove enchantment from Emerald Upgrade, default to standard functions for upgraded sonics
Update TODO, consolidate duplicate lists