Add few stubs, move some code and fix CallChapter