I don't remember if I resolved the fire falcon issue properly. If I make it CR 2 and give it this power, then will everything be resolved?
Flame Spheres (Su): Four times per day, a fire falcon can discharge a pair of highly flammable spheres, one from each of its wingtips. Treat this attack as a ranged touch attack with a range increment of 10 feet and a maximum range of 60 ft. When a sphere hits anything, it explodes in a 10-foot-radius. A direct hit deals 1d6 points of fire damage. Every creature within 5 feet of the point where the sphere hits takes 1 point of fire damage. On the round following a direct hit, the target takes an additional 1d6 points of fire damage, and an additional 1d3 points of fire damage on the next round. If desired, the target can use a full-round action to attempt to extinguish the flames before taking this additional damage. Extinguishing the flames requires a DC 15 Reflex save. Rolling on the ground provides the target a +2 bonus on the save. Leaping into a lake or magically extinguishing the flames automatically smothers the fire.