Fixed some directories and dumb echo problems