fixes to cheerup partial formatting