Trivial edits for consistency, style, etc.
Merge remote-tracking branch 'origin/back-end-working' into back-end-working
Merge remote-tracking branch 'origin/back-end-working' into back-end-working
One preemptive bug fix.