Minor changes and tweaks. Edge case with scanning root directory found.