Fixed judge choices and some final touches