small fixes for format