Added rankings and corrected scoring