Major fixes to different broken parts

Need to do these things with more sleep :(
Update step 2 example