fix issues per Mikes testing