some new fixes