some fixes..