Refactored online live issues and found and corrected some merge conflicts.