Fix of severals issues

Correction of some bugs (like the one about smartphones).
Shaping of a part of the files.