some fixes....