Added more info, fixed formatting