Added changes from Jonathan Carter feedback.

Benjamin Mako Hill || Want to submit a patch?