Improvements on header and logging
...