Here is my updated patches rolled into one.