more callbacks.
Merge branch 'master' of github.com:laeh/laeh.github.io
..