Set up header and some other minor changes

Signed-off-by: Kirk Linkletter <kirk@theantimatter.com>