Added VS extension + bugfixes