formatting, updated tags, other small fixes