some fixes3