A. Correct. It's the same "chrism," or oil used at Confirmation, and is a sign of the child being filled with the Holy Spirit. It's a link between the two "sacraments of initiation."

 

B. Incorrect. Has it been a while since you were at a Baptism? In the former rite, a few salt grains were put on the child's tongue to symbolize wisdom and incorruption, but that's no longer done.