p1279 + full update: changed chapter tagging