Better error reporting.
Improved number checking in callbacks.
Merge remote-tracking branch 'origin/master'