Dol sen pr

Numerous bug fixes and output  info/formatting changes