Fixed headr and alignment issues