Ajout d'un FIXME && correction mineures
Signed-off-by: Nightmaster <nightmaster@seitaer.com>