One vim, and bugfixes