fix callbacks so that everyone gets the info they want...