added vim table mode
update and merge last changes.