maintenance updates
misc fixes and corrected a duplicate helper