Minor polish, seeing invisible parties not done yet