Three quick fixes

My bad, forgot to handle armor as a percent properly, and the info
narrate.
Merge pull request #3 from mcmonkey4eva/master

Three quick fixes - from upstream