some fixes added