cleanup and new callbacks for esilvm

i hope that I didn't forget anything