Add comments and one more xfail