cleanup + added vimspec support