re-factor variable/function name parsing, and add substring support to function resul...