fix tags and format some more