Revise genus distance to ensure the same range.
Cleanup
Updates for Genus and api updates.