more error corrections and imports fixes, adds back missing DamageSource class