Make NPC collidable and code structure improvements.