some fixes ;