Added more information and fixed formatting issues