Added confDiff option, small edits