new, clean version.
calltips, autocomplete, etc. not active through this commit!