Add forceDie, update goalselector field name
Refactor a name