more onBookEvent implementations + updated TODO
Merge branch 'master' into beta