Parser minor improvements and debugging