was going to do something else but got distracted and reviewed a few PRs, let me know if i missed any @average-vr-56795

Thanks!