synced with bling dotvim, resolved some issues