diff --git a/README.md b/README.md
index aac7731d..3a73201d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ You may loose all your Moneroj if you use this App. Be cautious when spending on
 - Monerujo means "Monero Wallet" according to https://www.reddit.com/r/Monero/comments/3exy7t/esperanto_corner/
 
 ### TODO
-- wallet backup functions
 - review visibility of methods/classes
 - more sensible error dialogs
 - check licenses of included libraries; License Dialog
diff --git a/app/build.gradle b/app/build.gradle
index 11b160a2..e4b338a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 10
-        versionName "0.5.3"
+        versionCode 11
+        versionName "0.6"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/doc/FAQ.md b/doc/FAQ.md
index d5240db0..2c86d100 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -17,11 +17,27 @@
 - Only 5 decimal places shown in transactions (full amount in details - click on transaction)
 - All significant figures shown in balance
 - QR Code scanning - make sure to *ALWAYS* verify the scanned code is what it is advertised to be!
+- QR Code for receiving
+- Backup wallets to ```.backups``` folder in main wallet folder (old backups are overwritten)
+- Rename wallets
+- Archive (=Backup and delete)
 
 ## I cannot select and copy the mnemonic seed
 Copying anything to the clipboard on Android exposes it to any other App running. So this
 is a security measure to keep your seed safe(r). 
 
+## My storage is getting full
+Newly generated wallets are stored in ```.new``` in the main wallet folder.
+They are never erased (for now). You can delete this whole folder from time to time.
+
+Also, the backup folder ```.backups``` is never automatically cleaned up.
+You may want to do housekeeping manually with a file browser.
+
+All wallet files (```testnet``` and ```mainnet```) are stored in the main ```Monerujo``` folder.
+So be careful erasing stuff. One of the future releases will split the wallets and move ```testnet```
+ wallets out of there.
+
+
 ## I sent a transaction but it's not in my received transactions list!
 Don't worry. Received transactions which are not mined yet disappear after the wallet is saved -
 I blame this on the monero code. Wait for the block to be mined.