more format fixes