Add some more callback stuff
Revise some junk