labeling change
removing some things to be done live code
some corrections to callback example