Various Parser bugs fixed