Testing version of directory API with dangerout functions commented out
minor fixes