- Minor performance increases.  This behavior needs rewriting really, it's pretty terrible.
- Fixed bad callback argument format.