bugfix to normalisation of function names; added edges for recursive calls.