Add nerdtree and unite

- also some other modifications