Parser corrected, a few changes in general