Fixed up formatters. Added more examples