fix some return code setting stuf that was no longer being used, and change name...