Updated everything: adding chapter tags