Added path display option, fixed a few minor bugs