Improved logs and adjust the timing of shuffle. COMMIT FOR REMOTE WORK. NOT TESTED YET.