Some More Updates

This is not tested because I is tired
"I don't always test my patches, but when I do, I do it in production"
Seriously though someone go test them
Revert "Some More Updates"

This reverts commit 63d0d82f672e94a4aad5af8f60f61d2cf84f505b.
Revert "Revert "Some More Updates""

This reverts commit c20767a0429318da9d67b9553a948df4970e811f.