Make step 4 functional again, fix various inconsistencies in comments