More work on inspector.