Added popopulate.
Cleanup
Support for directories.