add more info
fix the headers

the order is now maintaned