major fixes to about everywhere