various minor amends