some fixes4