directory and fixes