Fixes as per JM's suggestions & headings levels