step 2 +corrections bugs divers
step 2 + corrections bugs