All look very good. Most of those are things I should have considered myself, sorry for that.
Regarding empty directories, yes, this makes the tree a bit more crowded. It would be possible to haved them hidden and show them only when their parent is selected, maybe with a dimmed icon, but I thought it may be a little bit confusing and, more important, it was too complex for the time I had available.