Add basic handlers for 'callbacks' etc
Remove a lot of debugging messages which are unneeded