Extended ranking to 30th and little bug fixes