New callback manager, and other fixes