Making a few tweaks to header sizes (fixes #22)