Added NERDTree and a few helper functions, plus some minor tweaks