target inspection improvements and keys reorganized