*some fixes