diff --git a/AAXtoMP3 b/AAXtoMP3
index 70d5b84..f567698 100755
--- a/AAXtoMP3
+++ b/AAXtoMP3
@@ -45,8 +45,6 @@ while true; do
   case "$1" in
                       # Flac encoding
     -f | --flac       ) codec=flac; extension=flac; mode=single; container=flac;        shift ;;
-                      # Apple m4a music format.
-    -a | --aac        ) codec=copy; extension=m4a; mode=single; container=m4a;          shift ;;
                       # Ogg Format
     -o | --opus       ) codec=libopus; extension=opus; container=ogg;                   shift ;;
                       # If appropriate use only a single file output.
@@ -56,7 +54,7 @@ while true; do
                       # This is the same as --single option.
     -e:mp3            ) codec=libmp3lame; extension=mp3; mode=single; container=mp3;    shift ;;
                       # Identical to --acc option.
-    -e:m4a            ) codec=copy; extension=m4a; mode=single; container=mp4;          shift ;;
+    -e:m4a | -a | --aac ) codec=copy; extension=m4a; mode=single; container=mp4;          shift ;;
                       # Similar to --aac but specific to audio books
     -e:m4b            ) codec=copy; extension=m4b; mode=single; container=mp4;          shift ;;
                       # Change the working dir from AAX directory to what you choose.
@@ -669,9 +667,9 @@ do
 
   # If we defined a target directory, use it. Otherwise use the location of the AAX file
   if [ "x${targetdir}" != "x" ] ; then
-    output_directory="${targetdir}/${currentDirNameScheme}/"
+    output_directory="${targetdir}/${currentDirNameScheme}"
   else
-    output_directory="$(dirname "${aax_file}")/${currentDirNameScheme}/"
+    output_directory="$(dirname "${aax_file}")/${currentDirNameScheme}"
   fi
 
   # Define the output_file