Revert "Revert "Fix more evil bugs :boom:""
Revert "Revert "Fix more evil bugs :boom:""

This reverts commit 9848ef94a163d7ff3aabb22cc010ecf2eac526a7.

webtwic/webtwic.github.io,webtwic/webtwic.github.io