some fixes in work