Fix more Android

@clintbellanger @dorkster 

I hope you do not have anything against added comments to save files, which are "magically" usefull.