Fixed dir bug and message