fixes for Parser and Script