Issue #0 by jcfiala: Various small fixes to pass coder review.