Added tags, fixed some sectioning