some formattign fixes