Fix damage rendering, clean up code, add test NPC