A bit more cleanup. Still having issues with Damageable