Improved simulation of beam backgrounds and collimation at SuperKEKB