Bugs fixed

JL Script parser bugs fixed
Minor bugs fixed