added performance tests, and fixed an shunting yard error