some fixes5