Fix some bugs, basically just commented out some codes.