various polishing and format fixing