Make step 4 functional again, fix various inconsistencies in comments

Step 4 is tested and should be fully working again.