Type tweaks
header tweaks
better fix for #6