minor refactors and bugfixes
interceptors finished. Recursive directory lookup done