minor additions to #478