add some new fixes