"more symbol support, minor fixes"