Add 'sidebar' recognition. Tweaks. Still missing chapter 5 somehow