Fixed Directory Bug (And more)