Few more fixes to radius and org algorithm calculation