Fix makeId, makeStr and makeSubstr
Add inner String substitution
Fix inner String substitution termination
Merge makeRawStr to makeStr
Fix comma and right bracket detection in makeStr
Fix line increment in step
Fix line counting
Fix column counting