some fixes that I already made
Revert "some fixes that I already made"

This reverts commit 64e5fface13c8d5fc3d8343963c85b0d76c69daa.
Merge remote-tracking branch 'origin/goodworkings' into goodworkings