Updated in reponse to comments in pull/234, changed some more print statements into logger calls