Added two branch functions, improved error reporting in obscure cases. Added potential future tag name lookup