fixed different stuf