Cleanup and added poison counter

Cleaned up some code, added in a poison counter and improved the
changing of life.