Bugfixes, added JSON vim