some adjustment + broken tooltip