Small updates to NPC movement in and out