vim-airline and few fixes