Added Ranking & fixed several errors & tweaked a little