random changes (specially vi support and some aliases)