some fixes to style