Merge changes Ie0773f85,Ie5e75505

* changes:
  Even FASTER damage calculations!
  Have all the setters return changed