Improved and fixed up preresolve