Fix formatting and add additional information