Fixed quote parsing issues #13 and minor output fixes