syncing with MishkaRogachev, adding dago fixes