fixed typo; added TODO comment; commented out user-substitution test temporarily