intellisense improvements

better detection of correct context