Fix small parser bugs

Resolves #10 (closed), #13 (closed), #15 (closed), #16 (closed), #21 (closed), #23 (closed)