Added info and improved formatting