Fix bug in echo
Add numbers to sections in bookmarks