yet some fixes..