plug superclosure from jeremy and got some fixes with dave help