RPG: NaN damage fix (again)

And some other features.