several changes for clean up