xques's patches