changes from @ChadMartinson

that somehow i merged into the wrong branch? must be a Sunday