Fixing some mistakes and adding choice 4