More changes :)

@fcduarte can you please review. I will send you also a new apk for testing on your phone.