Parser debug

Improved parsing engine