qp diff more bugs fixed - seems to be working