fixed headers
fourre-tout commit with many small updates