[PARSERS] refactored syntax + minor bugfixes