some fixes biatch