better functionmap
Merge branch 'master' of github.com:CarlQLange/finesse