diff --git a/Plugins/MAD/MADDecoder.m b/Plugins/MAD/MADDecoder.m
index 1222f472f..d1a56d6b7 100644
--- a/Plugins/MAD/MADDecoder.m
+++ b/Plugins/MAD/MADDecoder.m
@@ -30,6 +30,8 @@ struct xing
 struct lame
 {
 	long flags;
+	int start_padding;
+	int end_padding;
 };
 
 enum
@@ -52,8 +54,11 @@ int lame_parse(struct lame *lame, struct mad_bitptr *ptr, unsigned int bitlen)
 	
 	mad_bit_skip(ptr, 17*8); //17 bytes skipped
 	garbage = mad_bit_read(ptr, 24); //3 bytes
-//	_startPadding = (garbage >> 12) & 0x000FFF;
-//	_endPadding = garbage & 0x000FFF;
+	
+	lame->start_padding = (garbage >> 12) & 0x000FFF;
+	lame->end_padding = garbage & 0x000FFF;
+	
+	NSLog(@"Padding; %i, %i", lame->start_padding, lame->end_padding);
 
 	return 1;
 }	
diff --git a/Plugins/TagLib/TagLibMetadataReader.m b/Plugins/TagLib/TagLibMetadataReader.m
index db4dc2caf..9139e3653 100644
--- a/Plugins/TagLib/TagLibMetadataReader.m
+++ b/Plugins/TagLib/TagLibMetadataReader.m
@@ -74,12 +74,12 @@
 + (NSArray *)fileTypes
 {
 	//May be a way to get a list of supported formats
-	return [NSArray arrayWithObjects:@"ogg", @"mpc", @"flac", @"ape", @"mp3", nil];
+	return [NSArray arrayWithObjects:@"ogg", @"mpc", @"flac", @"m4a", @"mp3", nil];
 }
 
 + (NSArray *)mimeTypes
 {
-	return [NSArray arrayWithObjects:@"application/ogg", @"application/x-ogg", @"audio/x-vorbis+ogg", @"audio/x-musepack", @"audio/x-flac", @"audio/x-ape", @"audio/mpeg", @"audio/x-mp3", nil];
+	return [NSArray arrayWithObjects:@"application/ogg", @"application/x-ogg", @"audio/x-vorbis+ogg", @"audio/x-musepack", @"audio/x-flac", @"audio/x-m4a", @"audio/mpeg", @"audio/x-mp3", nil];
 }
 
 @end