fixed header and some formatting