Revision to additional-symbols, should be almost complete