Shield and Fixes

Added shield, fixed some crashes related to combat mostly