Add nerd-tree and fix some bugs