more onBookEvent implementations + updated TODO