some ajustments