Fix an issue with miss messages for weapons.  Wasn't finished.
Cleaning up base objects a little bit so we don't have code duplication.
It still needs a lot of work.