updated from main repo, fixed completion and snippets