Fixed message handling

-Messages are more efficient, reports npc less often, reports death once
-Cleaned up code a bit