polish & corrections de bug