top: fix content in wrong chapter
top: various changes