updates to issue 115, per corytheboyds recommendations