Some header tweaks
Update build files