Cleaned up files

Added immortality check
More tweaks to events