Fixed ranking/other large fixes
