Comment out armor casts, fix stencil table bug
Fix merge conflicts