added glob lookup, some server refactorings