more details and format cleanup