Added tags for the XML marshaller. Also go fmt.