Slight changes to callbacks.js and objects.js