Major fixes and adjustments to all the steps, especially 2 and 3 (all of them)