more new fixes