Fixes #15
Fixes #14
Fixes stack overflow on procedure autosuggest
Fixes #14, #15