This patch addresses previous fixes that needed further adjustment, introduces new fixes, and includes various small tweaks throughout. However, I forgot to note them down and can’t remember all of them at the moment...