fixe a few tings