[Broken version] - Crashes at launch.

Just additions / modifications to the last version.
Stable (or at least runnable) version comming up soon.