Three quick fixes - from upstream

My bad, forgot to handle armor as a percent properly, and the info
narrate.