different changes in subfunctions,
first corrections in parser function