Fixed a number of bugs.  Added in mh and oh weapon cells.