refactors and minor fixes/changes
iron out globbing edge cases