Joining tested on HEC, some minor bugs fixed, exposed some other bugs in persistent storage