fixes and removing bad callback