!! some fixes