Fixed spelling, additional directory checks