took care on errors, combined two sym files, adjusted Token to support  error messages