Resolves #12
Minor header tweaks.
Initial work on #14
Resolves #6