Fixed tokenizing bug and added empty 'cd' to Makefiles.