Step 4 done, some things fixed