some cleanup and handling for more enchants