parsing fixes, concatenator
parsing fixes, concatenator