restyle & fixes