Small fixes
First version of step 6