Improved Schemesfor Episodic Memory-based Lifelong Learning