added vimperator, some small changes