First full version of step2
Fixing some typos