- a bug with virtual directories not working
- code clean up