major fixes to style