more fixes to style