fix https://github.com/microsoft/vscode-extension-samples/issues/189 and some polish