Small fixes and improvements for style
Add full chapter and section structure