Rebuild patches, merge some patches, add reverting of removal of mark.py

YOU CANNOT STOP MARK HARMON