fixed up callbacks
#cleanup