Merge pull request #37 from eaburns/dev/eaburns

A few smaller fixes.