expiry fixes + better renderer support