fixes: responding to two remaining comments