diff --git a/Makefile b/Makefile
index ab66adb..52c0100 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ INCLUDES	:=
 # options for code generation
 #---------------------------------------------------------------------------------
 
-CFLAGS	= -g -O3 -Wall -Wno-unused-but-set-variable $(MACHDEP) $(INCLUDE) -Wno-pointer-sign
+CFLAGS	= -g -O2 -Wall -Wno-unused-but-set-variable $(MACHDEP) $(INCLUDE) -Wno-pointer-sign
 CXXFLAGS	=	$(CFLAGS)
 
 LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
@@ -33,7 +33,7 @@ LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:=	 -lasnd -lSDL_mixer -lsmpeg -lvorbisidec -lSDL_image -lpng -ljpeg -lz -lSDL_ttf -lSDL -lSDL_gfx -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard 
+LIBS	:=	 -lasnd -lSDL_mixer -lsmpeg -lvorbisidec -lSDL_image -lpng -ljpeg -lz -lSDL_ttf -lSDL -lSDL_gfx -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard -ltinysmb
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -126,12 +126,13 @@ dist: $(BUILD)
 	cp keymap.bmp $@/fbzx-wii/fbzx
 	cp ZXSpectrum48k.png $@/fbzx-wii/fbzx
 	cp FreeMono.ttf $@/fbzx-wii/fbzx
+	cp fbzx.smb $@/fbzx-wii
 	cp AMSTRAD CAPABILITIES COPYING FAQ README README.TZX VERSIONS VERSIONS.wii $@/apps/fbzx-wii/doc
 	touch $@/fbzx-wii/tapes/dummy
 	touch $@/fbzx-wii/snapshots/dummy
 	touch $@/fbzx-wii/microdrives/dummy
 	touch $@/fbzx-wii/scr/dummy
-	cd $@ && tar -czf ../fbzx-wii-bin.tar.gz *
+	cd $@ && tar -czf ../fbzx-wii-vx-bin.tar.gz *
 
 distsource:
 	cd .. && cp -r fbzx-wii fbzx-wii-v
diff --git a/VERSIONS.wii b/VERSIONS.wii
index 4cb9671..30e13fe 100644
--- a/VERSIONS.wii
+++ b/VERSIONS.wii
@@ -3,3 +3,14 @@ version 1:
 		* Initial release
 
 		-- Fabio Olimpieri <fabio.olimpieri@tin.it> May 1 2012
+
+version 2:
+		* Added smb support
+		* Added usb disk support
+		* Added joypad as joystick function
+		* Added saving of all configurations and buttons 
+		* Improved virtual keyboard
+		* Fixed bug in sound emulation  
+		* Fixed some other small bugs
+		
+		-- Fabio Olimpieri <fabio.olimpieri@tin.it> May 13 2012
\ No newline at end of file
diff --git a/fbzx.smb b/fbzx.smb
new file mode 100644
index 0000000..9dad265
--- /dev/null
+++ b/fbzx.smb
@@ -0,0 +1,7 @@
+# SMB configuration
+# set to 1 to enable smb
+smb_enable=0
+user=USER
+password=PASSWORD
+share_name=FOLDER
+smb_ip=192.168.0.1
diff --git a/meta.xml b/meta.xml
index 92223e2..4a4668f 100644
--- a/meta.xml
+++ b/meta.xml
@@ -2,8 +2,8 @@
   <app version="1">
     <name>FBZX Wii</name>
     <coder>Oibaf</coder>
-    <version>1.0</version>
-    <release_date>20120501</release_date>
+    <version>2.0</version>
+    <release_date>20120513</release_date>
     <short_description>ZX Spectrum Emulator</short_description>
     <long_description>A ZX Spectrum emulator for FrameBuffer written by Sergio Costas, see http://www.rastersoft.com/fbzx.html.
 The port to Wii was done by Fabio Olimpieri.
@@ -15,16 +15,25 @@ Put .z80 and .sna files in /fbzx-wii/snapshots or .tap and .tzx files in /fbzx-w
 Press the home button to access the in-game menu. Press 1 to select an item and 2 to escape.
 
 Press the "+" button to access the virtual keyboard.
+
+The in-game menu allows you to insert tapes, load them and configure the display, joysticks etc.
+
+The easiest way to play a game is to load a snapshot (.z80 and .sna files).
+
+You can also insert a tape file (.tap and .tzx) and then load the file in the tape menu (it simulates the command Load "").
  
-The in-game menu allows you to insert tapes, load them and configure the display, joysticks etc. 
+If you have problems with a .tap file, likely the TAP file has a program which uses a custom routine to load the blocks; in this case, try to disbale the "Tap fast speed" function.
+ 
+If you want to speed up the tape file loading (both for .tzx file and .tap file with "tap fast speed" disabled), try to enable "turbo mode" which speeds up the emulator by 4.
+In this case, do not forget to revert to normal speed after the loading.
 
-Snapshots and scr files will be stored on the SD card.
+The preferences are saved (joystick type, machine, buttons bindings, etc.) from the main in-game menu and they are loaded on start-up.
 
-The preferences are saved (joystick type, machine, etc.) from the main in-game menu and they are loaded on start-up. 
+You can also load a file from a usb disk and from your PC using a wi-fi connection.
 
 If rumble is enabled, the wiimote rumbles each time the fire button is pressed. 
 
-See http://wiibrew.org/wiki/fbzx-wii for more information.
+See http://wiibrew.org/wiki/FBZX_Wii for more information.
 
 </long_description>
   </app>