bug fix, and add logging to eventbus