fixing various problems with membership renewal