Fixed pretty printing to allow for extras too.