fix mis-assigned pads & include cwilso's monkey-patch