Planetary flyby with less calmy and also other improvements