and minor improved to symbol handlign as well