fixes for format