Resolution finished modulo gap in proof and tidying up.