cleaned out some incorrect return values. some are still hiding