simplification de code; corrections de bugs.