fix error, styles and updates rm