Improved usability

These two quick changes should help others avoid some of the roadblocks I had getting this code working.