some fixes are added