extensive changes in callbackmaker: each of the two windows now has its