fixed and added Tom's combo patches and tuned some others