Change Dying -- WIP

Fixes from last commit breaking game