Added in type headers, and adjusting sizing.