Fix bugs in upcoming code, fragment still not completed