Leafkiller: Merge with Shmoo's script & update for 5.4