Changed tag formatting and other small updates