updated callback handler
added some callbacks
small bugfix