Start of Headers to Hash and table/list alignment and some other small things