- fixed CallbackHandler bug, did some reformatting stuff