Updates and fixes

added direct substitution and ignore certain type of words