Completion of callbacks and bug fixes