Bugs fixed and AddParser comments updated for NL.