fixed inline code indentation for identators with inline code, and variable substitution corner cases
merge