Poprawne formy zaznaczono pogrubioną czcionką: 

1. Your room is a mess! I wish you would pick up your clothes from the floor!

2. I didn't need to wait/ needn't have waited long for him because he arrived a